Rafactored Data Connection and Model