Added pagePicker c2/c3 compatibility