Re-organized toy data