modify builder for function and variable