WIP: Map to Entity.