Added handlers and table of handlers