Revise device build system