Added basic CSP support