Add PageSizeStateHelper and minor update.