Javadoc update and getter, setter for attributes