Modified data to be generic