Added another key support