Dominic: cleaner builder usage