Add new cursor-based navigation
Small improvement: shorten array notation