Add Build model
Refactor