Updates, add new optimization for constant variables