Updated for Hummingbird APIv2