Improved file recognition\parsing