Update for latest RethinkDB