Added mutiple key support