Reorganization and db work