CM'ify externals, hardware and few more things