Added options for using volumes other than home.