Update for new api
Reduce down to primitive-only parameters & return type