Added new templates, javadoc