Complete API with count, version bump