Removed support for other data sources