Added renaming of name and description. Added support for new DataSources.