Refactoring for Graylog2 0.20.0