Enhance the base model assertions