Updated to conform to refactoring of enav network