Added better Key and KeyCode support