Added conversions for keys and buttons