Shrihari: Added some more features