Re-organization and Map support for the JSP tag.