API comments for v2.0