Further improves builtins