Fixed #84

Implemented support for different DataSource types.