Improvements of this modules