add builtins the right way