Changes for new derivative API