FIX - Adding Group to GenericWork