Data checking added