Fix list of reserved variables
Add tracking code