Revert "Revert "Create dsaf""

This reverts commit 26c8728e8dcdee54035469b5dea93cbf7a815845.