Changed EntitySync to reuse ArtifactGroup entity for more flexibility