Updated for to make the data more generic