Improve build system, add more packages