Vinay, Hemanth | #1522 | Change interface. Make it simpler