Modified Task to take optional arguments