Implemented persistence check and added error flagging for all critical fields