Improved FileHandler