Feature/008/build war