Updates to Write API
Merge branch 'my'