Updated for shoebill-common