Changed enum to include MWF