Change departure to optional in model