Reworked DB models