Incorporate CSP events