Updates to JSV and JSP