Update for Make DataInitializer optional with a spring parameter #25