Shrihari: Added related keyword support