Added all entities (testing required)