Additional data validation work