Refactored to page method arguments