Initial work to make metro support the identical build support