Adding Command key support