Rounding out the complete API