Incorporated other modules