updated for Aviary-SDK 3.0.2