Added missing entities and strategy classes