Added documentation + renaming