Updates to pave the way for site settings updates