Added more/better/worse checkin for cross referencing data types