Shifting Model Classes to Shared