API enhancements
JavaDocs