Modified pre-processor definitions