Added more Closure stuff