Some enhancements

Change-Id: Ib22383c88cd3ccae6a8ded85cc16606ac2674e06