improve formula support