Further enhancements

Change-Id: I6584ca5e8c33b105ef0e99fe737d6da3b3e08073
Signed-off-by: Mohamed Abukar <abukar.mohamed@nokia.com>
14 files changed