Fix get values in model generator