[IMP] Improved data initialization logic