Improve current file checker