updated Data helper