Added support for task arguments and args option