Moving annotating variables into variable controller