Modified javadoc and added annotations.