Changes to implement find specific workgroup