Moved data manipulation methods to models