This should be on the PageResolver, no ?