Updated for volume mounting