Improve inference rules