Add support for consts