Changed Entity Values to Interface Values