Add constant support