model changes

Add NONE to enums