OK, it's starting to make sense.
I was not aware of the enum function, but I can see from your example how my original structure was locked to just the rooms set out and that enum will provide the flexibility required.
Thank you for taking the time to provide this comprehensive answer, I think I can move forward now.
Angus