#2 Fix model relations and migrations