Adding Xcode groups support