Adding first set of changes

Signed-off-by: santhoshe <santhosh.edukulla@gmail.com>