Updated use of constants