Make command and trigger handling less costly