Migrated the entities from the assignment3 version