Added support for different module systems