Adding orders group support