Updated OnboardingDoc to use multiple fields