Added support to pass options to task

Tidied up output