Add 'Client' and 'Public' columns