Extend use of constants