More API
Diff fix
Minor