Changing the config structure to support command based generic arguments