Added space/building, and roles now exist even if they don't have labels.