Fix to Config Manager and group