Started working on transition to new database format