Addition of Javadoc and Dependency Injection