Issue #83 - Organization updates