Changes to pass CSP Validation