Some fixes.
New ElasticSearch persistence class.
Merged files.