Destructure map entries in datasource-config
datsource-config: destructure options and use doto
Merge pull request #8 from jstepien/simplifications

Minor simplifications