Type changes adopted to constants