Added support for per page override