Update for RethinkDB support.