Added Additional Changes for DataWithKey