Add some controls on variables