Changed file's structure