Reorganised DB a bit more