Improvements on module creation