New schema for the builder

proposal.