Changed handler inheritance, added unit tests and docu