Better Volumes and WorkingDirectory support