Added class definitions to models