changing some classes to work with Py2neo 2.0