Refactor to make the a container for multiple sites