Fix Volumes and Work directives to use new api