Fixed the data pull logic to use new model