Move to OrientDB 2.0-M2