Small changes to better fit the code generated model.