Refactored Page to add additional extension points.  #1041