Allow org_type to be nil