CLI options parsing catalog & schema changed