Add vars and blocs annotations