Adds SAF Support