Fix for issue 10: Add initial delay to SAF entries