Changes to support TrayGarden interfaces changes.