Update notes for submitted changes

* Add timeout on prepare call per datastore