Making it work with latest neography, etc.