That is how I thought we wanted it, where you are adding to the previous EFO. Either case, the EFO stuff will be it's own getter and setter in the next iteration so should be moot.