Updated plugin to handle CustomPageProperties