Model type refactor, global enums