Modified dependencies to remove circular dependency with config-db