Added addresses and closures count