Re-order api functions