Add namespace to hiliter - Rohit/Senthil