Improve task type ListDatasources.
Remodeling cim handlers.