Make flow navigation easier