One more refactoring for view manager