Changed to final dataStructure