Module Improvements