Polishing database files (2)