Some changes on the database structure