Refactored and Updated edoc.