Updated arango code