Added name to tasks
Added support for variables