JSP improvements