Added more functionality to Viewport