Added Support for more Keys