Added config items and a builder