Namespace support added