YH-578: add extra info to organization helper