Added step 4 - Replace ViewModel export