Added complete set of scriptlet tags