Refactor percol configuration