[#18]: Update the entity mapping