Adjust CLI to new compiler interface