Fixed device ID lookup error, updated device mapping file, renamed class