Adapt to current model