modules improvements