Updates to constant handling