Removed org & visibility fields