implemented the enhancements

Signed-off-by: mailsrikanta <mailsrikanta@gmail.com>