Adding path variables in the annotation flow