Added Group Entity
SN-22 subtask