Update notes for submitted changes

* Fix UnsupportedOperationException.
Update notes for submitted changes

* Fix UnsupportedOperationException.