Added basic functionality for rishi