#11 Use centralized page store