Merged populate and generate, added a schema generator