Rename to navigationEvents & support array