Re factored Data Listing