Add InitDataBuilder. Test refactoring.