Updated to work with gorethink v0.3