Added some model classes