Added native build stuff to with_build branch