Adding preliminary group support