Implemented data-integrity validation