Updated to use the mappings and documents introduced in elasticsearch_dsl