FUL-165 - Fix entities mapping