Fix issue 1 and issue 2 - getGroup and registerEntityToGroup created