Refactored es.yml