Add closure and environment scope