Added reusing of handler classes and fixed a few errors.