Add option dispatching (from previous version of armet).