Improvements

1. Added data check mode