Multi-Key support added.