NEW: Add entities mapping