Avoid clash in between modules
Update CHANGELOG