Refactor Model class