Added entities and context