More supported file extensions for Spark templates & "Refactor for CSP"