Added documentation and simplified configuration