Improve native build system