Change due to DFC code changes