Adds command message support
Fixes keyboard support