Added configuration for full dataset (in blocks A & B )