add constant handling