Updated file structures