Reduced code redundancy in APIv3