Added new methods and javadoc