Refactor bundle entry builder.

Use existing bundle entry elements.