Updating our Model Classes