Add SuperClosure support