Refactored objects.current_page