add site extension changes to provide better support for SAF structure