- Added namespace support