Fixed DB tables
Fixed model relationships