Refactor DataMapper