FIX: Made init consistent with new models.