Separate utils and es functionality