Added support for permanent ad-hoc device assignments.