Updated scroller classes