Added further configuration to main class. Refactored method extraction.