Updated the Site factory
Merge