Check in refactoring of data to support different calls