Added supports for constants