Highlight modifications. Added elasticsearch types and minor changes