Page Handler Support added