refactor: ModelProps is now less complex