Adding extra handlers and Fluids + cleanup