Adding changes to Data constructor and adding variables to link classes