Updated Bond class