Change to Volume and add some enum