Added factories. Reworked DB tables.