Changes for FunctionalReflection