Added the support for class inheritance and skipping handlers