Added mapping for the rest of the entities