Started changing the Entity Generator for use with Mongo