add site extension changes to provide better support for SAF structure
Merge pull request #339 from MauriceManning/siteextended

add site extension changes to provide better support for SAF structure