Changed db tables, fixed assosiations