New Key mappings and minor fixes by replacing obsolete objects