Make build system better