Need to add account_id to the list of values returned for machines/readings