Ajay/Melanie | #000 | ViewModel Refactoring