Added collection subgenerator, update model and view subgenerators