Additions to enumeration write API
Merge branch 'my'