Better files skipping logic