New options and enhanced templates