Added more keys to Converter