Added data format check