Update subsites support for latest release