Cleanup
Always convert ids to int
model_class -> model_collection
Add missing requires