Feature/deviceclass change