Make handler class invokation more dynamic