File structure improvement