Improved pages migration