Small refactoring and added example configuration