Improve onboarding data