Adding variable tracking for any assignment