More work on the database