Better support for constants and promises