Tweak config format to allow for a bit more flexibility