Ok, so I just did a pull request with 3 more wrappers. The pool trim wrapper (which is fine), an unknown catalog resource wrapper (you'll need to look at the clone code for this, as it doesn't have a CatalogGroupID, so I wasn't sure what to do there) and the Spandrel wrapper.
The Spandrel wrapper is incomplete. TBH, I don't really understand how to write a sub-class. So, I did what I could and set it all up nice and neat for you to easily finish. I'm hoping that seeing how you do it may allow me to learn how to do it myself.