Added ConverterKey. More cleanup