DS: DataBase improvements