Fix bug 1741 - adding support for persistent volumes