Improve find header scheme, not finished yet