Updated database schema
Updated database schema (WIP)

EF-Data update pending (WIP)!