Adopt new Waxfile pages structure