Module improvements