Updated for base model