Made $CONFIG_DIR optional