Use new assertion types