Improve builder field