Did some refactoring to simplify using SuperModel and registering models and collections.