removed unnecessary complexity in ViewModel storage