Added back in Computed Navigator

Signed-off-by: Matt White <matthew.white@fclonline.com>
Updated UPMark to work against Computed Navigator

Signed-off-by: Matt White <matthew.white@fclonline.com>