Facade improvements

Add in changes to ViewModel