Added JSP support