Moving methods to model