Modified all organization of handlers, to support multiple