Fix Volumes serialization issue #47 and set tenant ID instead of name