Added base entity mapper although don't like it