Updating to latest garden changes. Several interfaces were changed on the garden side.