Changed AddBuiltin to SetHandler