Added client-side API (CRITICAL)