Switched to using structs for all jacobian data