Some changes for module path works