Added model classes
Revert "Added model classes"

This reverts commit f8c04188e77631ac17335286633028e36d1fd306.
Revert "Revert "Added model classes""

This reverts commit ac6800cf2833def57031f1db244576dfb8de936d.