Added more Handlers and Templates
More Handlers and more Templates, what more do you want?