Separated single-site and multisite options
Fixed multisite approach