Javadoc added and method signatures changed.