Updated for latest D8 changes.