Updated for latest Reef.