Added variable declares for data validation