Adding keyup support