Now tracks variable modifications