Added (limited) support for Onyx models.