FIXED : #68 : Group support