Add soulmate and remove Elastic search