First Commit to add new enhancements

Signed-off-by: Mohammad Rafiq <rafiq.mohammad@whiteskylabs.com>