Refactor bundle builder.

Use existing bundle elements.