Update subsites support to match latest version