File structure change improved