* Module Wrapper Improvements