Refactored to remove hard-coded citizen tenant