A bit more refactoring, making backups for other RDBMS would be interesting