Adding mapping of entities funcionality to client, beta