Updated FileHandler