Add support for constant expressions