Add build support