Small changes with builder