Coils: Moved add-data-source into framework