Impove build process