* Improved FileStateDatabase