Add option for not handling commands