Adding function and variable support