updated for TinkerPop 2.5.0-SNAPSHOT