Bridge/group/light persistance (Still dirty - need to pull out into model)