Keep tools and data in sync

Keep tools and data in sync