Added FileWriter and Logger