Refactored Task to Handler
Update sourcebundle commit