Removed Closure dependency