Improve build configuration