Added JavaDoc for onXXX methods