Simplified generators. CatalogController now uses correct fields. Fixed #37