[*] complete DataSource
[*] refactoring for tests
[*] complete console