DataStore - now does the heavy lifting of creation

Moved the creation into the data store which uses
the model classes which are registered.