Add volume directive, and update comments