put generator in a class
updates for schema changes
version 0.3