Update to support enum marshall/unmarshall from string/enum