Adding wrapper key functionality