added constants support