Add back builtin commands executation