Added suport for data volumes