Changes done for module split