Expand API with handy dandy predefined classes