Add PortableDevice support