Move to using value instead of types in @Handler annotations