API & document update (phase 4 & 5)