Add support for multiple external closure variables