Refactoring: extracted Elastic stuff to a concern