updated builtin handling