Add support for new site layout