Add right module names
Extracting functionality