Added span support.