added mapping for new entities