Removing manual requires by deferring invoice require