Added address fields to citizen