Replaced School Subdomain logic to patch logic