Modify CSP function and add helper to force download