Improvement to the way constant value is retrieved