Added key-typing and mouse-clicking