Fix relation handling for model/update