Support for Organization Name and ID