Updated to defer invocation by default