Added FS based DB