Changing pages generator to use marked-metadata