Add named variables and default handling