Changed to use , documentation changes and refactorings