Updated for SimSearch