PageLock refactoring