Add volume mapping support

Remove logging changes for now.