Improve builtin items