Updated storage sitehandler to support connection handlers