Command security now also works for non-Function commands.