refactored connection dataschema and config