Added multy key support