Added documentation and names