Tweaked the way Keywords' config is generated