Revamp toolchains