Updated framework and pagination helper methods