Added data checks