Make the shared model - view model relationship cleaner