Make build process clearer