added CSP support