improves span to support events