added csp support