Extracting more modules