Changes for rectifying the API for new UI

Change-Id: I6a9ce096e83e1563295d8479fc5d47d07624ce35