Bug fixing and support for keys