Varun, pulkit | Changing client API to work with handler