Added missing entities