First version of ElasticContext added