Feature/improve build process