Few improvments in file system dao