[#49737445] - Make environment check use objects instead of arrays