Moving methods to model classes