Added Model classes

Added new model classes (not finished yet)