Replaced DEFAULT_PER_PAGE with PER_PAGE