made improvements to model classes