improved module loading accross platforms
improved module loading accross platforms