Module loader improvement