Better information around the namespaces field

Change-Id: Ia43c8458f6aeeb47da49d03ee3ca92ed30443068