Updated file architecture