Add data validity checks