Removed data source classes, refactoring later.