Added namespace support for keywords