Builtins and lambdas refactor