API & document update (phase 3)