Started adding the data handler