Make better use of the site config