Corrected API to be XML-compatible