Rewrite thirdparty module usage + thirdparty updates