Improved module export