Update EDFI context header file with Cristiano's changes