KeyCatcher class added