Adding custom success handlers

Change-Id: I02d9cb172ee16c27289d50ff1f3c29516351f98f