Add new per-user infrastructure.