Add --trace for more debugging