Adding support for notional functions for bonds