Added FCI and APU groups