Added KeyConverter and codes