Added device name support. It's awful... don't look