Provide a custom group and vars for the mode

Here's another small improvement. :-)