Added more elasticsearch mapping