Improve 1st party module detection