Add revised builder