Comply with autogiro Organization interface update