Added documentation, use of configuration