Add entities and mapping