Added also a builder