Reorganize DataModel methods