add expand for constants