Add partial support for scroll