adding navstate support