Added build_top