Move all DataMapper code to Character