Updated Entity classes and repository to match