Externalized data source config; added jdbc token store