Added argument capture support