Intermediate : fix var identification in structs