Added elastic search and removed guard