Added namespace support
Tested namespace support