Added compilation ifdef for NV swap groups