Updated model classes and their repo