Added fields for organic groups and configuration