Group command refactored