Aligned to OrientDB 1.4.0-SNAPSHOT