Added EDTypedefEnums.h file and tweaked associations in rest of model files