[Organization] Refactored to comply with the new Generated API
[Organization] Refactor: The hard ones