Fix model relations and work arround it