Keymapping and missing imports fixed.