Changing StreamingHandler to SiteHandler