Adding full locate by key support
adding key features