Source and Task interface updated