Why did you change this? The above format was more readable & extensible.