Simplify persistance code to be per-room.