Migrated resolve_handler to INIT/METHOD macros