Updated for latest cookbook changes