Core update (file handling remix)