Remove `model_class`, use simply `model instead.
Add some arguments to factory functions