Should we be adding this span automatically?