Merge in EnumModel into Main File