Add force-key-unit event support