Added other modules and their dependencies