Changes to support JSPONLY