Entitymapper

See commments in commit messages.