Include only the needed modules
Refactoring