Rework DB a little.