Add withViewport