Fix Issue on DB Closing
Fix issue on FileMonitor not really recursive