Move to the new API for Models