#250 redesign DB-structure and connected methods/functions