Fixed FileDB and improved