adding per-device prefix