Work done on namespace support: