Revert "Revert "Added model classes""

This reverts commit ac6800cf2833def57031f1db244576dfb8de936d.