Enhancing  functionality

Change-Id: Ib0a3ea874b08d8afea610a08a51fb5d7e0a25a60