Improve the IFActionHandler