Further improves builtins, methods