add site extension changes to support SAF site structure