Reduce API footprint