Added subpage parsing