Exported modules corrected