Updates

Underscore added to handle inheritance for models.