Added code for '+' and '?' closures