Updates from recent DB changes
Fixed relations
0.1.0