Added entities and models