Fix for #365
Add elastic search as datastore .Fixes for #347