Complete 2.40.

I find nested maps difficult :S