Revert "Revert "Csar features""

This reverts commit f2e3e5149e4389ccd1608f1ffe0661b132084bee.