Adding more no-xml api, fixing old ones.