Modifications to Data classes for Reference entries