Model classes

Added and Changed model classes and relations