Adds data folder
Adds SAF support