Fixed API and javadoc