Moved source change into Ds module adding error callback support