Add md5 and clean up FileHandler