Added support for configuring data dir