Added all necessary modules for further development