Reorganized the require method calls