Changed redis to elasticsearch
Added custom property