Added some enhancement