Reordered require for easier patching