Refine default data creation.

- Refine default data creation.