Default handlers implemented and fixed handler call