Adding support for embedded configstore + configuration