Added FileAndDirectoryHandler