Small fixes

- Added contract definitions for IDataSource
- Added 'Async'-suffix to method names to comply with the async method
guidelines
- Some small bugfixes here and there