Added more add group validation