Data conversion changes