BaseOptionedModel and BaseParameteredModel adapted to PR #8