Add build support 2